iconcache: Guard deprecated gdk-pixbuf APIs
authorBenjamin Otte <otte@redhat.com>
Fri, 11 Sep 2015 16:33:05 +0000 (18:33 +0200)
committerBenjamin Otte <otte@redhat.com>
Fri, 11 Sep 2015 16:33:05 +0000 (18:33 +0200)
gtk/gtkiconcachevalidator.c
gtk/updateiconcache.c

index 9afc0c61cf87b954c68ec4e9d40ba810621249a5..907e19afc3d5220b38fc0a162d3659654ba1efb9 100644 (file)
@@ -163,9 +163,11 @@ check_pixel_data (CacheInfo *info,
     {
       GdkPixdata data;
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
       check ("pixel data", gdk_pixdata_deserialize (&data, length,
                                                     (const guint8*)info->cache + offset + 8,
                                                     NULL));
+G_GNUC_END_IGNORE_DEPRECATIONS;
     }
 
   return TRUE;
index 47375d10ddfae794b864732dd2fb6eb7ab94a6d8..4a1196667676f5a022c0588f259fde899eaea93b 100644 (file)
@@ -514,7 +514,9 @@ maybe_cache_image_data (Image       *image,
 
          if (pixbuf)
            {
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
              gdk_pixdata_from_pixbuf (&idata->pixdata, pixbuf, FALSE);
+G_GNUC_END_IGNORE_DEPRECATIONS;
              idata->size = idata->pixdata.length + 8;
              idata->has_pixdata = TRUE;
            }
@@ -825,7 +827,9 @@ write_image_data (FILE *cache, ImageData *image_data, int offset)
   if (!write_card32 (cache, 0))
     return FALSE;
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
   s = gdk_pixdata_serialize (pixdata, &len);
+G_GNUC_END_IGNORE_DEPRECATIONS;
 
   if (!write_card32 (cache, len))
     {